From 883b30a09610d08164ddf21b9346f0033a8dc16c Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Fri, 6 Mar 2015 17:19:16 +0000 Subject: [PATCH] freemem: remove call to libxl_wait_for_free_memory Now that libxl_wait_for_memory_target is capable of waiting until dom0 reaches its target, we can remove the other wait function call: libxl_wait_for_free_memory. No need to wait twice. Once dom0 has met its target, simply loop again and recalculate free_memkb. Signed-off-by: Stefano Stabellini Reviewed-by: Mike Latimer Tested-by: Mike Latimer Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3c3bab3bcf..399b6b6cee 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2220,15 +2220,9 @@ static int freemem(uint32_t domid, libxl_domain_build_info *b_info) if (rc < 0) return rc; - rc = libxl_wait_for_free_memory(ctx, domid, need_memkb, 10); - if (!rc) - return 0; - else if (rc != ERROR_NOMEM) - return rc; - /* wait until dom0 reaches its target, as long as we are making * progress */ - rc = libxl_wait_for_memory_target(ctx, 0, 1); + rc = libxl_wait_for_memory_target(ctx, 0, 10); if (rc < 0) return rc; -- 2.30.2